Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Sun, 2 Mar 2014 08:42:35 +0000 (16:42 +0800)
committerXue Fuqiao <xfq@gnu.org>
Sun, 2 Mar 2014 08:42:35 +0000 (16:42 +0800)
commit4b9827e019f004f11630c904fc82a3910c1cfd13
treea03e2cc1775e62f02d0422aacbf5ce0cc118c64b
parente488e776983b4805f1d75c152f8d04adb590c83b
parent004fb6e3cd6aab8d3b71f91e5bc4ef56528a8366
Merge from mainline.